From 7bc1377e7d5196b427ac6cb8791f74e7d340b0bd Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Thu, 16 Dec 2004 15:47:33 +0000
Subject: [PATCH] bitkeeper revision 1.1159.1.489
 (41c1ae15sywguDGAUkFv75uAeynxkg)

build fixes
---
 xen/arch/x86/Makefile | 4 ++--
 xen/common/softirq.c  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 55603231a1..8609adc521 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -12,11 +12,11 @@ OBJS += $(patsubst %.c,%.o,$(wildcard mtrr/*.c))
 
 OBJS := $(subst $(TARGET_SUBARCH)/asm-offsets.o,,$(OBJS))
 
-ifneq ($(TARGET_SUBARCH),i386)
+ifneq ($(TARGET_SUBARCH),x86_32)
 OBJS := $(subst vmx.o,,$(OBJS))
 OBJS := $(subst vmx_io.o,,$(OBJS))
 OBJS := $(subst vmx_vmcs.o,,$(OBJS))
-endif ($(TARGET_SUBARCH),i386)
+endif ($(TARGET_SUBARCH),x86_32)
 
 default: boot/$(TARGET_SUBARCH).o $(OBJS) boot/mkelf32
 	$(LD) $(LDFLAGS) -r -o arch.o $(OBJS)
diff --git a/xen/common/softirq.c b/xen/common/softirq.c
index ab2f243e15..2a59925a07 100644
--- a/xen/common/softirq.c
+++ b/xen/common/softirq.c
@@ -13,7 +13,6 @@
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/sched.h>
-#include <asm/vmx_vmcs.h>
 #include <xen/softirq.h>
 
 irq_cpustat_t irq_stat[NR_CPUS];
-- 
2.30.2